[BOUNTY & WIP] Porting Gronn stuff into Vanderlin#5250
Open
Singul0 wants to merge 41 commits intoMonkestation:mainfrom
Open
[BOUNTY & WIP] Porting Gronn stuff into Vanderlin#5250Singul0 wants to merge 41 commits intoMonkestation:mainfrom
Singul0 wants to merge 41 commits intoMonkestation:mainfrom
Conversation
Author
|
Not used to vanderlin's code so sorry for fucking anything up 🙏 |
github-actions
bot
added
the
MERGE CONFLICT
CheffieGithub
added
the
Lore
Collaborator
|
To be clear - did Ook want the nation ported, or just the gear? |
Author
He just mentioned me to do the code part of porting gronn classes and its associated code. I heard that he's going to adjust the lore as needed to vanderlin |
Collaborator
|
Then you should discuss the lore with him since I'm not going to have this merged until the lore is updated to not be azure's lore |
github-actions
bot
removed
the
MERGE CONFLICT
github-actions
bot
removed
the
MERGE CONFLICT
tired-wired
suggested changes
Feb 26, 2026
| /datum/skill/misc/swimming = SKILL_LEVEL_EXPERT, //All of you can suck my dick they're SEAMEN | ||
| /datum/skill/craft/sewing = SKILL_LEVEL_NOVICE, | ||
| /datum/skill/craft/cooking = SKILL_LEVEL_NOVICE, | ||
| /datum/skill/combat/axesmaces = SKILL_LEVEL_EXPERT, |
tired-wired
suggested changes
Feb 26, 2026
Collaborator
tired-wired
left a comment
tired-wired
left a comment
There was a problem hiding this comment.
Here we go. The big lore pass.
Co-authored-by: Sinclair <75549227+tired-wired@users.noreply.github.com>
github-actions
bot
added
the
MERGE CONFLICT
github-actions
bot
removed
the
MERGE CONFLICT
github-actions
bot
added
the
MERGE CONFLICT
github-actions
bot
removed
the
MERGE CONFLICT
Author
|
I think that's it? Hopefully I didn't butcher or cock it up too much 🙏 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Got asked by Ook to port gronnic weapons armor and advclasses from Azure Peak. So here they are.
3 Armor sets. 1 Light, 1 Medium, 1 Heavy
Heavy (Unique Mace):
Medium (Unique Shortsword):
Light (Axes/Handclaw):
WIP Cause they are still missing a lore touchup to fit Vanderlin's world
Why It's Good For The Game
Ook asked for it, more variety and such
Changelog
🆑
add: Adds 3 new mercenary classes alongside their respective armor
/:cl:
Pre-Merge Checklist